bitkeeper revision 1.271 (3f056397PcaG7S5EhqWlJo04hQMtfA)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/rac61/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/xeno.bk

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/ignore
index 119cbbb8b4c8233be1bd3d319d6d0f53568f5f7e,3ecd4cfcf6a2285623a8e3712c946f6645b7ce1b..a31719cbf1a632bf4cf40afe34a5c9e44c82fe71
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -232,6 -232,6 +232,12 @@@ tools/internal/xi_creat
  tools/internal/xi_create.o
  tools/internal/xi_destroy
  tools/internal/xi_destroy.o
++tools/internal/xi_phys_grant
++tools/internal/xi_phys_grant.o
++tools/internal/xi_phys_probe
++tools/internal/xi_phys_probe.o
++tools/internal/xi_phys_revoke
++tools/internal/xi_phys_revoke.o
  tools/internal/xi_start
  tools/internal/xi_start.o
  tools/internal/xi_stop
@@@ -408,6 -408,6 +414,7 @@@ xen/include/as
  xen/include/hypervisor-ifs/hypervisor-ifs
  xen/include/linux
  xen/include/xeno/compile.h
++xen/include/xeno/physdisk.h~
  xen/net/dev.o
  xen/net/dev_mcast.o
  xen/net/devinit.o
@@@ -419,4 -419,9 +426,3 @@@ xen/tools/figlet/figle
  xenolinux-2.4.16-sparse/arch/xeno/drivers/block/Makefile.orig
  xenolinux-2.4.16-sparse/arch/xeno/drivers/block/block.c.orig
  xenolinux-2.4.16-sparse/scripts/kconfig.tk
- xen/include/xeno/physdisk.h~
 -tools/internal/xi_phys_grant
 -tools/internal/xi_phys_grant.o
 -tools/internal/xi_phys_probe
 -tools/internal/xi_phys_probe.o
 -tools/internal/xi_phys_revoke.o
 -tools/internal/xi_phys_revoke